From 08b2d9056008a231063a7f274a5f6106d91bd401 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 7 Jan 2025 18:42:29 +0100 Subject: [PATCH] sdext: adapt xpdfwrapper to poppler 24.12 Change-Id: Ia47edf2ac821e3ef5c40f7582253f894eac74060 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179902 Tested-by: Jenkins Reviewed-by: Michael Stahl Gbp-Pq: Name poppler-24.12.diff --- .../source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index 57164f27cb4..6748431e53d 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -1090,7 +1090,12 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str, int bitsPerComponent = 1; StreamColorSpaceMode csMode = streamCSNone; +#if POPPLER_CHECK_VERSION(24, 12, 0) + bool hasAlpha; + str->getImageParams( &bitsPerComponent, &csMode, &hasAlpha ); +#else str->getImageParams( &bitsPerComponent, &csMode ); +#endif if( bitsPerComponent == 1 && (csMode == streamCSNone || csMode == streamCSDeviceGray) ) { GfxRGB oneColor = { dblToCol( 1.0 ), dblToCol( 1.0 ), dblToCol( 1.0 ) }; @@ -1305,10 +1310,17 @@ poppler_bool PDFOutDev::tilingPatternFill(GfxState *state, Gfx *, Catalog *, std::unique_ptr pAlphaStr(new MemStream(reinterpret_cast(pSplashBitmap->getAlphaPtr()), 0, nBitmapWidth * nBitmapHeight, Object(objNull))); auto aDecode = Object(objNull); +#if POPPLER_CHECK_VERSION(24, 10, 0) + std::unique_ptr pRgbIdentityColorMap(new GfxImageColorMap(8, &aDecode, + std::make_unique())); + std::unique_ptr pGrayIdentityColorMap(new GfxImageColorMap(8, &aDecode, + std::make_unique())); +#else std::unique_ptr pRgbIdentityColorMap(new GfxImageColorMap(8, &aDecode, new GfxDeviceRGBColorSpace())); std::unique_ptr pGrayIdentityColorMap(new GfxImageColorMap(8, &aDecode, new GfxDeviceGrayColorSpace())); +#endif OutputBuffer aBuf; initBuf(aBuf); writePng_(aBuf, pRgbStr.get(), nBitmapWidth, nBitmapHeight, pRgbIdentityColorMap.get(), -- 2.30.2